From 8604e12694fef08494c2e15fd85acd92dddd8111 Mon Sep 17 00:00:00 2001 From: Volodymyr Babchuk Date: Wed, 16 Aug 2017 21:44:56 +0300 Subject: [PATCH] arm: traps: handle unknown exceptions in check_conditional_instr() According to ARM architecture reference manual (ARM DDI 0487B.a page D7-2259, ARM DDI 0406C.c page B3-1426), exception with unknown reason (HSR.EC == 0) has no valid bits in HSR (apart from HSR.EC), so we can't check if that was caused by conditional instruction. We need to assume that it is unconditional. Signed-off-by: Volodymyr Babchuk Acked-by: Julien Grall Signed-off-by: Stefano Stabellini --- xen/arch/arm/traps.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index c07999b518..eae221272c 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -1717,7 +1717,7 @@ static int check_conditional_instr(struct cpu_user_regs *regs, int cond; /* Unconditional Exception classes */ - if ( hsr.ec >= 0x10 ) + if ( hsr.ec == HSR_EC_UNKNOWN || hsr.ec >= 0x10 ) return 1; /* Check for valid condition in hsr */ -- 2.30.2